Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge b4bdev 20240404 #2455

Merged
merged 64 commits into from
Apr 5, 2024
Merged

Conversation

adrifoster
Copy link
Collaborator

Description of changes

change needed for the addition of a dglc component in cdeps #2449
Move the dust emission source function soil erodibility for the Zender scheme from CAM to CTSM #1967

Specific notes

Contributors other than yourself, if any: Various

CTSM Issues Fixed (include github issue #):

Closes #2222 - Fixing Negative Ice Fluxes from Ocean to Glacier
Closes #2117 - Add LND_TUNING_MODE for CAM4, CAM5, CAM7
Addresses #2149 - Change handling of LND_TUNING_MODE so user is warned of which option is used, add more supported options
Addresses part of #1836 - Move the soil erodibility dataset dust emission source function from CAM to CTSM
Helps with ESCOMP/CAM#651 - Move the dust emission source function and global tuning factor from CAM to CTSM

Are answers expected to change (and if so in what way)? No

Any User Interface Changes (namelist or namelist defaults changes)? Yes, namelist options for dust added

Testing performed, if any:

build-namelist tests (if CLMBuildNamelist.pm has changed):

derecho - PASS

regular tests

derecho ----- OK
izumi ------- OK

dmleung and others added 30 commits March 13, 2023 00:46
…he global tuning factor.

We will keep the global tuning factor in CAM. dmleung 5 Apr 2023
Rework handling of evaporation constraint in SoilFluxes

Occasionally, h2osoi_ice was going significantly negative in
UpdateState_TopLayerFluxes - see
ESCOMP#1979. As noted in that issue, this
seems to be due to h2osoi_ice having a very different magnitude from
h2osoi_liq, leading to greater-than-roundoff-level differences from zero
final state in a relative sense (i.e., relative to the magnitude of
h2osoi_ice) - I think because of the appearance of the sum (h2osoi_ice +
h2osoi_liq) in the equations that limit fluxes.

To try to deal with this, I have reworked the handling of the
evaporation constraint to directly limit both the liqevap and solidevap,
so that both of them should result in the equivalent liq or ice states
going to 0 within roundoff.

To do that, I needed to move the partitioning of the total flux into
liquid and solid to earlier in the subroutine and then recalculate those
partitioning fluxes in conditions where we're applying an evaporation
constraint.

Note that I applied a max of 0 to the new fluxes because many initial
conditions files have roundoff-level negative H2OSOI_LIQ, so without
this limit, we were getting roundoff-level negative fluxes.

Resolves ESCOMP#1979
…ure lnd_tuning_mode has all of the clm physics options paired with all of the forcing types, build-namelist tests now pass
BFB merge tag dev166

2315 @TeaganKing Refactoring run_neon for PLUMBER2 part1
2326 @samsrabin run_sys_tests: Check Python environment for FatesColdTwoStream tests
2213 @samsrabin Automatically assign high priority items to project 25
2330 @samsrabin Add Izumi version of the aux_clm unit testing

 Conflicts:
	bld/namelist_files/namelist_defaults_ctsm.xml
	bld/namelist_files/namelist_definition_ctsm.xml
	bld/unit_testers/build-namelist_test.pl
	cime_config/config_component.xml
…for the Zender scheme how the soil eroditability file is handled
…gic for it, this compilers, but does NOT run
…1_Mmpi-serial.1x1_brazil.I2000Clm51SpRs.derecho_gnu.clm-clm51cam6LndTuningMode PASSes
… a version for each lnd_tuning_mode, and for CAM4 cases for the f09 grid
ekluzek and others added 25 commits March 20, 2024 18:59
…t_interp, this gets the ERI_D.ne30pg3_t232.I1850Clm51BgcCrop.derecho_intel.clm-clm51cam6LndTuningMode test giving identical answers as baseline
Move the dust emission source function soil erodibility for the Zender scheme from CAM to CTSM
change needed for the addition of a dglc component in cdeps
@adrifoster adrifoster merged commit a65df14 into ESCOMP:master Apr 5, 2024
2 checks passed
@adrifoster adrifoster deleted the merge-b4bdev-20240404 branch April 5, 2024 02:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fixing Negative Ice Fluxes from Ocean to Glacier Add LND_TUNING_MODE for CAM4, CAM5, CAM7
6 participants